Remove unused strings from the ruler_metrics structs, to avoid

2006-04-02  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkruler.c: Remove unused strings from the ruler_metrics
        structs, to avoid relocations.  (#336917, Stephane Chauveau)

diff --git a/ChangeLog b/ChangeLog
index 56f35dd22e9075294b32fdb5bfbe3ea3ec8ceebd..59f13a92e070eb98a7b71b1dd596299844118069 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkruler.c: Remove unused strings from the ruler_metrics 
+       structs, to avoid relocations.  (#336917, Stephane Chauveau)
+
 2006-04-02  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
        * gtk/gtkrecentmanager.c (gtk_recent_manager_set_filename): Build

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 56f35dd22e9075294b32fdb5bfbe3ea3ec8ceebd..59f13a92e070eb98a7b71b1dd596299844118069 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-04-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkruler.c: Remove unused strings from the ruler_metrics 
+       structs, to avoid relocations.  (#336917, Stephane Chauveau)
+
 2006-04-02  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
        * gtk/gtkrecentmanager.c (gtk_recent_manager_set_filename): Build

diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 625b7787f3feb4b3efe9e75a132da8637768987c..ccc9b86be86377b492f40e69db1701d983a8a985 100644 (file)
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -61,9 +61,9 @@ static GtkWidgetClass *parent_class;
 
 static const GtkRulerMetric ruler_metrics[] =
 {
-  {"Pixels", "Pi", 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"Inches", "In", 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }},
-  {"Centimeters", "Cn", 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  { NULL, NULL, 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  { NULL, NULL, 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }},
+  { NULL, NULL, 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
 };